52c52
< #include <sane/config.h> //
---
> #include "sane/config.h"
68,72c68,72
< #include <sane/sane.h> //
< #include <sane/sanei.h> //
< #include <sane/saneopts.h> //
< #include <sane/sanei_scsi.h> //
< #include <sane/sanei_ab306.h> //
---
> #include "../include/sane/sane.h"
> #include "../include/sane/sanei.h"
> #include "../include/sane/saneopts.h"
> #include "../include/sane/sanei_scsi.h"
> #include "../include/sane/sanei_ab306.h"
77,78c77,78
< #include <sane/sanei_backend.h> //
< #include <sane/sanei_config.h> //
---
> #include "../include/sane/sanei_backend.h"
> #include "../include/sane/sanei_config.h"
267,268c267,268
< 			       sizeof (scsi_request_sense), 0, sense_buffer,
< 			       &len); //
---
> 			       sizeof (scsi_request_sense), sense_buffer, 
> 			       &len);
356c356
< 			       sizeof (scsi_test_unit_ready), 0, 0, 0); //
---
> 			       sizeof (scsi_test_unit_ready), 0, 0);
519,520c519,520
< dev_cmd (Mustek_Scanner * s, const void * src, size_t cmd_size, size_t src_size,
< 	 void * dst, size_t * dst_size) //
---
> dev_cmd (Mustek_Scanner * s, const void * src, size_t src_size,
> 	 void * dst, size_t * dst_size)
523c523
<     return sanei_ab306_cmd (s->fd, src, cmd_size + src_size, dst, dst_size); //
---
>     return sanei_ab306_cmd (s->fd, src, src_size, dst, dst_size);
525c525
<     return sanei_scsi_cmd (s->fd, src, cmd_size, src_size, dst, dst_size); //
---
>     return sanei_scsi_cmd (s->fd, src, src_size, dst, dst_size);
573c573
< 			sizeof (scsi_get_image_status), 0, buffer, &len); //
---
> 			sizeof (scsi_get_image_status), buffer, &len);
584c584
<       return sanei_scsi_cmd (s->fd, buffer, sizeof (buffer), 0, 0, 0); //
---
>       return sanei_scsi_cmd (s->fd, buffer, sizeof (buffer), 0, 0);
618,619c618,619
< 	  return sanei_scsi_req_enter (s->fd, readlines, sizeof (readlines), 0, 
< 				       buf, lenp, idp); //
---
> 	  return sanei_scsi_req_enter (s->fd, readlines, sizeof (readlines),
> 				       buf, lenp, idp); 
631,632c631,632
< 	  return sanei_scsi_req_enter (s->fd, readlines, sizeof (readlines), 0, 
< 				       buf, lenp, idp); //
---
> 	  return sanei_scsi_req_enter (s->fd, readlines, sizeof (readlines),
> 				       buf, lenp, idp); 
643,644c643,644
< 	  return sanei_scsi_req_enter (s->fd, readlines, sizeof (readlines), 0, 
< 				       buf, lenp, idp);  //
---
> 	  return sanei_scsi_req_enter (s->fd, readlines, sizeof (readlines),
> 				       buf, lenp, idp); 
719c719
<   status = dev_cmd (s, scsi_inquiry, sizeof (scsi_inquiry), 0, result, &size); //
---
>   status = dev_cmd (s, scsi_inquiry, sizeof (scsi_inquiry), result, &size);
750c750
< 			   sizeof (scsi_request_sense), 0, sense_buffer, &len); //
---
> 			   sizeof (scsi_request_sense), sense_buffer, &len);
819c819
<   status = dev_cmd (&s, scsi_inquiry, sizeof (scsi_inquiry), 0, result, &size);
---
>   status = dev_cmd (&s, scsi_inquiry, sizeof (scsi_inquiry), result, &size);
1774c1774
<   return dev_cmd (s, cmd, 6, (cp - cmd) - 6, 0, 0); //
---
>   return dev_cmd (s, cmd, (cp - cmd), 0, 0);
1889c1889
<   return dev_cmd (s, cmd, sizeof(scsi_set_window), (cp - cmd) - sizeof (scsi_set_window), 0, 0); //
---
>   return dev_cmd (s, cmd, (cp - cmd), 0, 0);
1916c1916
<   return dev_cmd (s, cmd, sizeof(scsi_set_window), (cp - cmd) - sizeof (scsi_set_window), 0, 0); //
---
>   return dev_cmd (s, cmd, (cp - cmd), 0, 0);
1934c1934
<   status = dev_cmd (s, cmd, sizeof (cmd), 0, result, &len); //
---
>   status = dev_cmd (s, cmd, sizeof (cmd), result, &len);
1964,1965c1964,1965
<       status = dev_cmd (s, cmd, sizeof (scsi_read_data), 0, 
< 			s->hw->cal.buffer + line * len, &len); //
---
>       status = dev_cmd (s, cmd, sizeof (scsi_read_data), 
> 			s->hw->cal.buffer + line * len, &len); 
2031c2031
<   status = dev_cmd (s, cmd1, buf_size, sizeof (scsi_send_data), 0, 0); //
---
>   status = dev_cmd (s, cmd1, buf_size + sizeof (scsi_send_data), 0, 0);
2038c2038
<   status = dev_cmd (s, cmd2, buf_size, sizeof (scsi_send_data), 0, 0); //
---
>   status = dev_cmd (s, cmd2, buf_size + sizeof (scsi_send_data), 0, 0);
2115c2115
<   status = dev_cmd (s, cmd, sizeof (scsi_read_data), 0, s->hw->cal.buffer, &len); //
---
>   status = dev_cmd (s, cmd, sizeof (scsi_read_data), s->hw->cal.buffer, &len);
2184c2184
<   status = dev_cmd (s, cmd, buf_size, sizeof (scsi_send_data), 0, 0); //
---
>   status = dev_cmd (s, cmd, buf_size + sizeof (scsi_send_data), 0, 0);		  
2307,2308c2307,2308
< 	  status = dev_cmd (s, gamma, sizeof (scsi_send_data), 
< 	  		    s->hw->gamma_length, 0, 0); //
---
> 	  status = dev_cmd (s, gamma, sizeof (scsi_send_data) 
> 	  		    + s->hw->gamma_length, 0, 0);
2323c2323
<       return dev_cmd (s, gamma, sizeof (scsi_send_data), 0, 0, 0); //
---
>       return dev_cmd (s, gamma, sizeof (scsi_send_data), 0, 0);
2449c2449
<   return dev_cmd (s, mode, 6, mode[4], 0, 0); //
---
>   return dev_cmd (s, mode, 6 + mode[4], 0, 0);
2486c2486
<   return dev_cmd (s, mode, 6, mode[4], 0, 0); //
---
>   return dev_cmd (s, mode, 6 + mode[4], 0, 0);
2509c2509
<       return dev_cmd (s, gamma, 6, 0, 0, 0); //
---
>       return dev_cmd (s, gamma, 6, 0, 0);
2619c2619
<   return dev_cmd (s, gamma, 10, len, 0, 0); //
---
>   return dev_cmd (s, gamma, 10 + len, 0, 0);
2695c2695
<   status = dev_cmd (s, start, sizeof (start), 0, 0, 0); //
---
>   status = dev_cmd (s, start, sizeof (start), 0, 0);
2762c2762
< 	     sizeof (scsi_test_unit_ready), 0, 0, 0); */ //
---
> 	     sizeof (scsi_test_unit_ready), 0, 0); */
2764,2765c2764,2765
< 	    return dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 0, 
< 			    0, 0); //
---
> 	    return dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 
> 			    0, 0);
2770,2771c2770,2771
< 	    return dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 0, 
< 			    0, 0); //
---
> 	    return dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop),
> 			    0, 0);
2774c2774
< 	status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 0, 0, 0); //
---
> 	status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 0, 0);
2805,2806c2805,2806
<   status = dev_cmd (s, scsi_ccd_distance, sizeof (scsi_ccd_distance), 0, 
< 		    result, &len); //
---
>   status = dev_cmd (s, scsi_ccd_distance, sizeof (scsi_ccd_distance),
> 		    result, &len);
2964c2964
< 			sizeof (scsi_get_image_status), 0, result, &len); //
---
> 			sizeof (scsi_get_image_status), result, &len);
3019,3020c3019,3020
<   status = dev_cmd (s, scsi_get_window, sizeof (scsi_get_window), 0, result, 
< 		    &len); //
---
>   status = dev_cmd (s, scsi_get_window, sizeof (scsi_get_window), result, 
> 		    &len);
3115c3115
<   return dev_cmd (s, backtrack, sizeof (backtrack), 0, 0, 0); //
---
>   return dev_cmd (s, backtrack, sizeof (backtrack), 0, 0);
